@Kully merge this into yr branch if you want :) I didn't want to commit anything directly to yr branch just so you have full control of this.

Can you test this out and see if it will work for you? If you just want to mess around with it locally without merging, you can cherry-pick it like so:

git fetch origin
git cherry-pick d53c7ef715b1f0390435ad22147ae49a64d2e9cb
git reset HEAD^

That does the following:

1. fetch the new things from this repo
2. add this commit to your PR locally
3. move your HEAD from that commit to the one before, moving those changes into your staged files

Be careful about git reset HEAD^, that undoes one (^) commit from the current commit yr pointing to in git.

Feel free to copy/paste if that feel simpler :)

Closing since the added code lines here have been manually entered into the referenced PR #584